Filling out the API