Add more TODOs for dissertation backburner