Full working importer

currently ovation2/source-query branch dependent