Work on moving to matrixes
Added some translations