more app base refactors.