update ALL of the TODOS