Import Plugin major cleanup - work in progress.
Parser improvements.