Relocating TODOs so we can take care of them in one place