Initial work for changing sender/reciever wire contract