some changes to client server, but nothing fully working yet. Lot of commented out code