Changes to Chat WIP