Ported some work over from Vers3 for the Calendar. calendar package
needs cleanup.