First refactor of "names etc list"