Adding in on-the-fly-importing.