Submiting the working chat and some editing of code