Reimplemented Client/Server - Still not quite working

Seems to deadlock when just run, and sometimes throws null pointed
exception.