Started working on matrix module