Added Calender View, bug fixes, uses a model now, etc.