TODO's
* Cleaned up some generated TODOs
+ Adding some TODOs