Thought I had committed this earlier. Calendar class proper.