I think the matrix part is now usable