Modmatrix 2.0

Changes to modmatrix.