Switched some properties around to move the validation away from this module and up to the application.