Trying RemoteTech again, with merge