working on cleaning up api
adding more stubs