Finishing FilesService and getting everything to work