Finish implementing the API as it stands.