Revert "Revert "calendar :S""

This reverts commit 10e01c1dcf3d31569a72e19e0a4cbdf8299971f3.