Started more Work on the API