Moved Publish/ReceiveClientId into a common Message class
Updated the rest of the app to play nice with new Message