Base stuff in importer done
Merge branch 'dennis_branch'