Now using Bundle Transformer for bundles
Few things that didn't get added on last commit