chat works almost
Merge origin/master