Some progress on the API.