Overhaul, named waypoints, version 0.1