Make TODO more obvious for future CLI updates