Got rid of the Matrix struct; simplified the API