Major refactor for peer channel in raet