[wip] Stepup Bundle

PR to track progress on Stepup Bundle.