TODO and notes