Fixed TODOs for tonight