Filled up TODO and README.md