Fork API types.

All tests pass (for now...)  Rebasing this PR is a _pain_
Sounds like we're all on the same page here.