WIP incremental reexport