This is all there is/was to merge from Chat Listening branch. Next time
I do it over github, i promise