Additional Setup

Minor additions to prepare for pathfinding logic.