Port and fix calendars chapter