Added calendar

broken
Revert 752aa24..5b07391

This rolls back to commit 752aa24233c568885072e597b04c2208cb4b7c0c.