Core compiles.

Now to fix unit testing.