Move todos around. Now with TODO notes in the source code.