Continued working on Matrix.hpp