Started work on email integration