Client-Server Resolved