refactoring emails and templates to incorporate locations