More work toward full matrix version of math