More work on Zk. Still issues; some things working.

Change-Id: I9f2d26141bdb0ed843b038d43220ffffe11dedfc