Revert "move messaging methods back to class"

This reverts commit 565f9d6f297e1cc764789f57477810d03898aef7.