WIP on graph development