refactored: client app is no longer general