finish refactoring messages
Merge pull request #17 from bryceholcomb/messages

finish refactoring messages