Started conversion to sub-matrix system

Not-completed