Prep for removing hack
Merge branch 'feature/remove-hacky-calendar' into develop