Roll BackΒΆ

Roll back of old template complete. Just needs comment errors correcting.