Flesh out the API a bit more.