Make calendar an OOP