Adding client/server/prototest