Completed Matrix functionality - commit is long overdue.