Continued Work on Messaging