TODO updated
TODO and README updated
testing