Completed diplomat message sending strategy
Merge branch 'master' into feature
Starting to refactor main strategy