Yet another app loading branch

WIP for part 2 of the plan.