work finalizing email manager, some untested