Flesh out more of the api.