For z and K

Justin pointed out some things that are missing from this. I'm going to try and get it done by Christmas.