Refactoring: Big changes, created two Classes for the graph