Worked some on pathfinding. Refactored some code.
Merge.