More work on getting the API into the main repo