Updates @TODOs from previous