Make gcal kind of work
Merge