Waypoint commit. Most of the pieces are there.
Wrapper file is good