Working but still needs some more work.
Merge pull request #15 from MattAitchison/message-fixes

Working but still needs some more work.