Refactoring… still on a plane
Still refactoring, checking in often.  Still on a plane.
Reducing this to a simple wrapper of the API
Update docs