Properly implement (and refactor some of) calendars.