Still having issues with emailings
New files for templating