WIP: fix files method, tests are broken.