Fixing the build for specification

With a lot of help from Melissa/Roger/Josh the build now runs
Note, tests do not compile correctly yet.