Switch matrix to vec::Vec as a path of least resistance