Started refactoring geared towards MatrixGetter Object