add features and todo