Added threads for built-in event handling
Updated todo