client-move: edits to finish this.