added notifications and finished graph
fixed merge conflicts