Move TODO to where makes sense now