initial work on data-import parser refactoring