App refactor.
More stuff.