WIP changes to support multithreaded executor and timers