Complete refactoring, reducing matrix tests size, removing junk, adding progress bar.