WIP
edited yelp gem source
Merged