Adding waypoints works. Need to have these visually represented and removable as well.