Added more stuff to the Calendar class