More changes towards having private chat. Still buggy