Add and subtract waypoints at will