Nearly there ! A few small issues but it looks pretty good. We gained order of magnitudes of speed by measuring graphs internally rather than putting them on disk.