Added more initial code supporting CSV parsing.