Major rewrite of Yelp calls