Compiles with matrix changes, but need to hunt bugs.