Wip sip23 √

I had a flash of clarity :)