Added Matrix3, wip on uniforms