Add updated, working versions of calendar
Remove ical version of calendar