Merge pull request #1 from viperchris3/work

Starting code for client