Ben/calendar features