Draft of WIP4337

My initial WIP for FEAT4337