Feature/26/optional chat