Still wasn't compiling.  Does now.
Various naughty changes to make the build work that will need to be looked at in the morning