More pathfinding
Merge branch 'David'