Some progress with the core refactoring