Completed the calendar feature