More changes. Almost time to write the aggregator.