Fixed Chats, need to fix models