Start refactoring to add Calendar class