Waypoint commit. Borked.