further WIP, after clarifying things with denis