Refactor so clocks can be restarted on server startup