About to integrate bundles
Rework templates