Application controller refactor...