Started putting graph work in it own module
Finished pulling graph work out of main