Adding templates for elements back in.  Got deleted last push.