InProgress: Finally fixing EventAgger.