Surprise mother f'er

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