First cut updates to template