Refact msg

Since Norv likes it, let's move to break something else.