Started to work on email functionality