First pass at retrofitting the API.