Adds calendar code back in #13
Merge pull request #38 from KelseyLMay/branch13

Adds calendar code back in #13