Add option for task timeout

So we're removing this constructor?