moving some things around for mail
adding more of the email base