Began reintegrating templates