More work on API.