Fixes #9 as I started to clean up the Files code and put it into the 1 File class
Fix that should have been on master