Added more basic matrix functionality