Will wait till after class to address validation issue