Actually add $i
Use matrix/include