Working on fixing path finding