WIP refactoring startup and init behaviour