Some more work on client/Server