Improved the importer core. We'll soon get this running through some kind of job queue.