Add in basic importer and other small things