redid most of templates from scratch