Some work on the message system.