Federation of apps refactor, works