A big commit about message mechanisms and a lot of stuff