Add csv importer
simplify