client server work in progress
merge maybe
whitespace
client talks to server