continued work on the ZoR code. Seems to be good.