Email code added but commented out.  Starting new branch