Zone class etc

Merging zone and class changes