Now uses DataParser instead of manually reparsing csv