Started working on the email service