Merge pull request #24 from abhidbydx/cr_work

Client Module
CR Second phase changes