Starting more work on the API