Export - Intermediate commit, not tested, see TODOs