Started adding an email system