Bit of refactoring. Trying to restructure a bit to provide better auditing of the import process.