Wip sip23 √

This is nice - simplifies things.