App fully functional - minor refactoring needed