Dazed, Reeling, about to break

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