Refactor CSV - now with DyND

Alternative CSV refactor to #700