Refactor, remote capture: in progress