Fork API types.

All tests pass (for now...)  Rebasing this PR is a _pain_
Hrm, I'd argue that its relevant here because it tells you specifically what is timing out.