Changes:
- Changed text references that had been haphazardly copied from RequirementManager to actually refer to CalendarData fields
Slight alterations after previous lage merge.
Changes were only to test failing functions and add comments.  I will adjust to include the other changes in the next grouping.
I think I deleted a random space

Maybe.