New build with baked in templates