Added Z shape extraction to fit (not using it yet - that will be in the next commit)