Wip sip23 √

Don't I already?