Continued on the API some more...