Charles,
Nothing I've seen so far envisages disturbing the existing, in my opinion flawed, Matrix Class.
I trust that I have not missed anything.
Compilation is a complex press for a person unfamiliar with the C. Anything you could do to simplify that would be welcome.