small changes
doc
x
Start to address #120

Factor out the email stuff into a base class
progress on #120