Update TODOs
Merge branch 'develop' of github.com:CauseRoot/CauseRoot into develop