wip - crosstalk refactor