Work on matrix lib