progress on graph strucutre (won't lie that I remember everything that changed, git diff not readable)