adding lots more stuff to zeros branch; still doesn't compile