Merge pull request #24 from jamiedigweed/Multi-Z-WIP

Multi z wip
Multi-Z update
Merge pull request #241 from yashaldie/Multi-z

Multi z update