Flesh out API implementation a bit.