Waypoint commit. Working but incomplete