Revert "TODO Fixes"

This reverts commit 9eb777371ce029d742bdee2961400972c4c21ba3.
Revert "TODO List"

This reverts commit f78bb7ff741ee14ba7e40635cf543241c43fda90.