Added better TODOs