Sending/Receiving is now contained in the same classes