consolidated client and server to peer take 2