Adding manager methods to client
Refactored Client Methods, Not all methods complete
Resovled Conflicts with Client