Added bundling. More structure.