Issamefile

Ok, after looking at the code more carefully I realized there are many opportunities for refactoring, and also that there's no unit test coverage for the case where a stat fails.  I'm going to push a change in a few minutes to sort this out.