[WIP] Poc/apiimport2.0