More progress towards making the graphs work