Major refactoring. Moving logic into ViewModel and Service