Massive command upgrades.

If you want to test - please check ANY sub command.