Add some TODO's and remove some debug code.
Authored by: ryanmay 2010-08-27
Parent: [r8665]
Child: [r8667]