Messaging restructured. Ready for testing.