moved a little more to base app host