3 new files, halfway to generalization out of egp.