More groundwork for the Clockwork enhancements