Cleaned up the csv parsing, using a new csv parser.
Cleaned up the parsing.
Merging?