Add some "mv" brainstorming to the TODO.