DRYed up intermediate bundle

All works at this point