update to use component/enumerable

some of the tests are still busted due to .sort() being gone and I think I'm missing .filter