gather source to list
fixup:first pass