Add Calendar functionality: Close #17