Refactored to pull email validation out into separate class.