Added working interrupts
merging stuff?