WAYPOINTS (mostly complete, not fully optimized)