Rewrite and use the new find-file module