Feature/quotes