Reworking how the graph is organised. Everything is
sort of broken at the moment.