Continued work on matrix.hpp/cpp