Revert "updated calendar"

This reverts commit 66c6b797c88b1dcfab5a4caf054c4eb82f355c4c.
fixing
added mapviz
trying to fix it
fix again?
fix pt2
more conflicts