Work on FinancialCalendarGenerator classes