Validations, customer first or create, flash messages
Merge changes