Integrate app tiers

Complete. Let's merge and ship this.

/cc @pedro