Interrupts working now, time to cleanup