Adding TODO and better readme