WIP: add timeout