Did the stuff with the canvas calendar
merged