Work on graphs
Merge into master