Implemented some more of the API.