WIP
More wip, wrote tests
gofmt
Tests passing
Undo any partial completion
Untested wrapper code