#4 First cut at consolidating messages.
Closes #4.