abstracted out validations
Merge branch 'validations'
Merge branch 'master' of https://github.com/johnfoley3/CS430