Feature/chat 2

I don't think this gets used