Minor Refactoring

Starting to try and think through A* pathfinding