Make some progress on the NameSurferEntry