removed all dispatcher from code that isnt dummy code; untested