Starts new mailer templates, cleanup TODO
Cleans up multiple TODO's add one to list