WIP more on partial flow graphs