Refactoring the boot sequence...