More core refactoring - WIP build.