Rudimentary validation
Validation "fixed"
Merge branch 'validation'