Wip overall rework
Upgrade bundle done
Wip spying