Begin refactoring to support multiple bundles per group.