email confirm works
Merge branch 'matthew'