Working on talking to server in test3
Fixed some conflicts with test3