Working a little more on the api