Server-Client version mostly works now