Bundles with options for choices

Instead of having set bundles it would be nice for the client to be able to create their own bundle. Say all bundles come with photos but each bundle has their own number of add-on's allowed at that price point. So that way we could have one bundle but it could cover all available options. How it's set now we would need to create endless bundles to cover all options.