PeerId and Client stuff done