[WIP] poc/apiimport2.0

{@inheritdoc}
Please update everywhere