add pages infrastructure and upgrade-toggle
more upgrades