Refactor Dispatcher out into seperate mailer;