Major Application5 class refactoring.