WIP start rearranging initialisation
WIP refactoring startup and init behaviour
index refactor