playing around with waypoints some more