More work on adding the Zorro layer.