Sending email works
fixed merge conflicts