add email address validation
merge conflicts
resolving conflicts again