Graphs are close to working again ;)