More app refactoring...