More work to get the calendar working. Code is still broken.