Server/Client Code Merged, Closes #2 (hopefully)