More refactoring. Can now restart is dead.