Working on the api