implement commtrack todo

also fixes http://manage.dimagi.com/default.asp?78727