Upgrade TODOs to action items

Authored by sredman on Mar 25 2018, 6:27 PM.