This works now for matrices
Finished enriched tuple entry with (....).v and (....).m, passing tests