Make progress on calendar display and logic