Validations now work and match up with correct fields