Brought back the CSV option, refactored the main module