committing the rest of the API stuff