Move diff to rugged

Only for discussion. Not ready for merge.