Added chat to fiddle with
fixed socketclient merge conflicts