- add more messages
 - move things around