WaypointAdder: prepared for implementation