Updating csv parsing per Damien's recommendation