rebuildBundle getting closer

Checkpoint.  Still not working, but not quite *as* broken.  Currently
has the problem that it's scragging other branches in trees.