Working towards Bundler 3

Bundler