SDNA-514 - Sucked the client code into the project - need to make some small changes