Final changes minus foursquare integration