still adding email funcctionality