Reworking namesList. WIP