Code Cleanup and Experimental Code added

Client / Server code is experimental and extremely buggy!