Finishing up on the API