Implemented working calendar
Merge