Fork API types.

All tests pass (for now...)  Rebasing this PR is a _pain_
Fair enough. They are super long and force me to type ```2>&1|less``` way more often than I care to.