Build out more of the API