Adds more functionality to calendar. Fixes #2