Email Module Updated but unfinished