Changed CSV format to support hashes
Redid section 1 (loading data) to support hashes / cleaner code