WIP - JL add email

Line is too long. [90/80]