WIP Checkpoint updating MatrixPFill to new spew