Add all fancy stuff to ISR_Handler, it's now fully featured