added emailing, seems to work
merged
fixed merge issues'