Got simple client-server message passing working
Fixed merge errors