Add upsell, move some stuff around