Add TODOs for each _update_state() call
3 files changed