Validation Rewrite
Merge pull request #1 from betrandcheam/formerge

Validation Rewrite