Rock-on-the-ground

Upgrade for private generation and plan-specific commercial usage rights.