Update TODOs
Merge branch 'centricity' of https://github.com/jploudre/undevelop into centricity