More work on pathfinding...