Revert "Revert "dont need two lists""

yes?

This reverts commit e6a866203c19f030b24a50b8c106fc0891df18f7.