Work on the API a little bit