Updating App to CalendarApp