Add TODO for next redesign