Dev updated

Now ready to implement different graph types