Initial commit of edits made for tmatrix