Update to Client, I do not take credit for absolutely all the code in this repo