JK: Still working on the calendar grouping.