Add TODOs for remaining commands