Slowly getting the api together