AF-26: Add the ability to toggle apps and extensions via feature toggles
did slight refactoring