bundling mostly works

Implicit bundling should be mostly okay. The dropdown menu for explicit
bundling still needs doing, though