Lots o work
Some work on the message system