Make some progress on NameSurferDataBase