MatrixStack to unique_ptr reference
singleton to unique_ptr