what is the todo here? that the factory does not validate yet? if so we should rather have the todo on the factory