Yeah, that's a separate issue. I haven't changed anything here, just namespaced it. I want to overhaul the message facility in general.