Finalizing zonemap changes for now
Zones working