Chat help

PR from our hangout session :)