Add TODO and suggestions, so I remember them