Rearranging TODO items

[skip ci]
Rearranging TODO items

[skip ci]