WIP - test and implement Mail Shots

[ci skip]