WIP new file extraction