Disabling aggregation logic until it can be worked on some more...