Working on unit construction with new AI architecture