Cleaned up Calendar model1:wq
Cleaned up migrations
Calendar generation progressed