Reworked TODO section