Near to adding waypoints
Merge branch 'master' of github.com:mcfedr/golf