Added testing to see if waypoints work