amended TODO and added samples