mostly updating templates, thinking through what's needed