New cleaner templated 2D Matrix.