I'll add some temporary comments. We'll clean up TODOs soon.