wip
refactor to event hub rather than ports
remove leftover tests