Upload matrices added.
Changed to lombok and refactor.