More work on Matrix and Stack