oh, I already *partially* de-deduped it and forgot to remove this TODO. 
Still not entirely clean with the implementation though - would be nice to just drop in the same complete flag to multiple commands.