Add TODO for local storage, don't forget