re #756 now handles multiple files, ready to test