email stuff
Merge branch 'working'