Put TODOs in correct place to begin work next.