Work on event calendar, including bringing 1.x and 2.x versions more in line