also let me know when you're OK for me to merge this in! I'm still reading through the toEmail block but it all looks great so far..