Refactored ALL messaging