Serious refactor. Comments for bundles removed.