Nearly done with the api