Z-3

Finally merging Z-3 in, after unbreaking it, I'll put the big hole I cut
in it back in when I get a chance, just throwing this in here so folks
can do the Z split.