Continue mocking up the API, begin working on object relationships and fix error structure