Add matrix solver, remove irrelevant details