Simplified send and recv buffers, working on timeout issue still
Merge (more like overwrite) of remote