Made lots of changes to calendardata and associated classes
more changes