wip/bridge-utils
