Working version of superdiff with remote path stuff