Fix CSV formatting and WIP on parsing