Add actual fields to the Message class.
Fix small issue.
Started work on Client.