Reorganized classes some more, defined preliminary message handlers