One other thing to be aware of...
Wills are designed to deal with the disposal/transfer of assets, not to control their ongoing use from beyond the grave. It rang alarm bells for me that you've described the will as "set up so that Mary can live there until the day she dies, or decides to...