I've just merged branches from the past year's development work on @NclNumbas together.
Incredilbly, all the tests pass!

Going for a victory lap, Jonathan Edwards style