Refactored Calendar logic out of Counter Model into a new class