Major refactoring of Messages to make more sense and be less awful