Updated TODO, started messing with interrupts