Some progress with graph & node class