Moar work on picture ex/importers