Feature/more chat