Graph updated, incomplete  2 classes in here

NOT COMPLETE.