Work on yelp client