first pass at making bodies and bundles work with Ctrl+R