Finished rewriting the form validator.