Updated the forms to validators, as that's what they really are.