Total refactor how various events are integrated into the data generation system