pretty borken, most of the relay/bridge refactor, but not tested