MatrixGenerator is now a class. More events added.