Chatroom Support
before merging with dan
merged