Changed TODOs

Per conversations. Busy night ahead of me!