Feature/book 799

WIP, still missing the text for the email