Wip sip23 √

@viktorklang That's a different story, indeed. :-)