working on waypoints and subforms