Some progress on calendar generation, for Hunter to review.