More pathfinding work