adding email and match validation. Niether is working correctly yet