rearranging api
building out client wrapper