this also goes away after the validation is extracted out.