Reverted heuristic solution. Now trying with kNN
Current state of graph building (in progress)