Feature/more foursquare