Re-added AStar and pathfinding changes

Cos things dun fucked up