merge api into amherst
hardly to say that the API is done, but that it's functional to an extremely limited extent, enough to replace the previous version
hardly to say that the API is done, but that it's functional to an extremely limited extent, enough to replace the previous version