Started with app refactoring and refining.