json email stuff
Merge branch 'testing'