Add todos (move some to ExecuteBuilder)