rework Waypoints to inlclude entity/TE targets