Further work on SureFile (WIP).