CLI: Using indexes and adding remember functionality