Simplified models, added basic calendar

Simplified models, added basic calendar