Refs #13993 EEA; make reordering work; still WIP