wip on draft: restructuration ...