Added waypoint controller.