Work on removing color dep from Graph