Changes to implement Chat

Chat changes