Remap Q. Add a few bundles.