Zip In and Whirly Whistle

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