Performed an act of brutality to make the core components compile again.
But the tests.....