Initial template changes in place.
Inital template complete