Pull graph to its own file
Rename graph and add graph #2
Use Config to clean graph definitions