New graph

Merged back to master now that is cleaned a bit