Calendar feature

Merge in the calendar feature.