Incorporate some ideas into a TODO file. Poke @fat0troll