add x, y, and z
Merge branch 'auth'
finalize z code