Refactoring to move a ton of stuff from the calendar controller into a service