pr updates
amended pr review changes
resolved merge conflicts
updates from last night before rebase
update on message test now passing
removed nlog references and usage
resolve conflicts from HEAD
Reapply Events PR #679
update on message test now passing
removed nlog references and usage
