validation code added, needs to be tested/debugged
Merge branch 'master' of github.com:lwholeyCPSC/348_TFM