Basic matrix improvement... next, TokenMatrix will be necessary, and... could math wrapper functions receive a matrix?