More work done on reporting and mailing

Still very much wip