Reworked TODOs