Removed need for seperate client object. Merged the repo and client objects