Fixed Client-Server communication, commiting so that I can test on my
other computers