Completing email work, not yet tested though