WIP: Fix upgrade script
WIP: create page instance