Reworked TODO.