More work on emailing setup. Just needs some callers tp use it...