Wrote a matrix wrapper module & factory method, everything builds but will need to rewrite tests