More work on block duplicate, not quite there...