Added graph class, added some connects, renamed a couple of variables.