Fork API types.

All tests pass (for now...)  Rebasing this PR is a _pain_
There's an argument to pass to go test to get this timeout behavior-- let's not recreate it in every test?