Work on files some more