DNM: xio-firefly wip branch