Some major changes to import and other stuff.