Non-working commit

This is including ZFS-specific types, but not working yet :)