Some work toward CSV support