NameList fixes; Just need to add selections now