merged in templates from dev