Lotsa changes here.
Adding the email changes.