merged and trying to get client and server to play nice