Started rewriting the Form Validator