WIP - pre final message duplication in output