90 percent done adding aggregateeconomy support