josh edits
waypoints work
Merge branch 'foursquare' of https://github.com/yomanfosta/Detour into josh
merge with Josh