Reworked to just use the csv parser library