Waypoints

add support for waypoints