testing with waypoints added back in