Begin re-work of message system.