Switch to peer connection, some binary corruption but otherwise mostly there