Rewriting CSV importing stuff