Add notes to TODO re optimisation