Changes to event and eventcontroller, new branch for calendar work