More work on the data parser and insert statements