Further work on Drive for SureFile (WIP).