Add some more TODOs and rearrange them.