Calendar group update

Updates to the calendar tool.
Commits from
-Bryan Patzke
-Saher Talat
-Mike Sherry