Add the csv instance, add test and organize code a bit.
Add csv to header.
Merge conflicts.