Disable prompt and add TODOs