More work in progress on the API