Reworked TODO a little... by fare not complete