new importer, js consolidation