Command Generator overhaul (initial changes).