Adding enhanced validation for forms -- will need to add to docs