Upgrade 2 to 3 strategy/planning

Okay, start here