Progress for merge, need to work on quotes
merge with feature/quotes