Add more to Message
Implement more of the protocol