validations
fixed merge conflicts
Merge branch 'master' of https://github.com/Ryan5231/hood