Introduced AggregateData type...
First pass at aggregate conflict resolution working; overall code needs some cleanup...