Email notification work in progress