WIP: paip-clos
Merge