I think we need to work on the approach to messages, but probably not in this pull request.  We can talk about it next week.