Fixed merge
Interrupts work! Woo.