Clean up Calendar to move pure code to Scheduler. Start writing first test.