Updated todo.
Latches should show up in the hierarchy too.