More Z-level stuff, pretty good now