Refactor the CoreClock, now in software-services/ConfigurableClockImpl (the old SwingClock has been refactored but should not be used)