EmailService update

Finished the implmentation of the EmailService up the the part of
sending the email