Moved Emails to its own service. More work needed