Moving the matrix creation out of Solver
Oops