Add waypoint logic back to the bottom.
Merge branch 'master' of github.com:nprapps/wolves