Waypoint commit, pending modifying GoOse some to get better extractions.