Refactoring the boot monitor...