dispatcher cleaned up, and (almost) working