Well, the code itself as is is also open to that result. We are just hoping that the displayed app is the one we want. By implementing the changes you're making now we're already going down that road, which I agree could bite us at some point.  All I'm saying is that if we are doing this, all over the place, we should encapsulate it somewhere, and I think you're agreeing with that.

Whether that is `GaiaApps` or `Base` dosn't really matter to me, so if you think `GaiaApps` is more sensible, then let's do that.