CSV parsing client side and stuff.
Merge conflicts
Can now import a CSV.
Merge conflict