Next step towards a unified core layer, work in progress, failing tests.