Making progress on calendar integation