More work C++ aggregator, still a mess - but not far from a working mess