Did some TODOs, challenged others.