lots of refactoring to make FullCal display. But it does