added x y z
merged auth into master
finalized z code