progress on csv refactor