Update Classes

Added in a few classes and change the odd bit of the calendar