Interrupt code (almost working)

Getting rid of make-shift code written for qualifiers, and replacing
with legitimate interrupts