refactoring
test client/server for response/request, all good, + refactoring, add TODO