New feature description & TODO implementation