+ many changes to the template process for emails, and how elements are handled.
+ moved migration to be later.