Feature/finish chat