Splitting AStar out