80% there on refactoring for dialog/eventchains