Still working on improving the modularity of the emailing engine