Built in some front-end validations
merge conflicts RESOLVED!