Changed CSV parsing to use pythons csvreader