More TODOs. Because I'm sleepy.