+ calendar class now implemented