Minor refactor calendar
Implement tick on calendar route

This is best solution so far, but not a good one.