Switch to using CSV and iter_docs