Implemented Graph classes a little further