refactoring work to add calendars to the project