Refactored Persistent State Out of calenderServer.cpp