validator working
Merge branch 'jim-validate'
'validate'