Need to fix PathFinding