Worked on chat messaging
merged stuff