The Bundle:List still isn't working, but savigng the point where I'm at.
Closer, fixed a couple other mistakes that were transparently breaking things.