Merging Gabe's calendar changes to the yelp functionality