Switching branches....
Client seems to be sending and receiving correctly