Wrote a better waypoint endpoint.