Keep files feature

As requested - a version of pull request #630 except its now on a feature branch on the fork.