Adds calendar code back in #13