Fix graph functionality - 100% implemented