Feature/graphs

Feature ready, first draft of using Graph class for graphs