Make this stuff properly interruptible