Refactored client messaging into a new class.