- Added proper implementations of all the calendar classes