More work on the calendar
resolved merge conflict